Drop a few more unwanted exports

Remaining now are just cell accessibles.

diff --git a/gtk/a11y/gail.c b/gtk/a11y/gail.c
index 9c65ade98b678450ee126dcfc430ce1bda113e89..bfbf7eed505fbedc80edfbccfb583e9e1ccf4d82 100644 (file)
--- a/gtk/a11y/gail.c
+++ b/gtk/a11y/gail.c
@@ -58,7 +58,7 @@ static void     gail_set_focus_widget (GtkWidget *focus_widget,
 static void     gail_set_focus_object (AtkObject *focus_obj,
                                        AtkObject *obj);
 
-GtkWidget* focus_widget = NULL;
+GtkWidget* _focus_widget = NULL;
 static GtkWidget* next_focus_widget = NULL;
 static gboolean was_deselect = FALSE;
 static GtkWidget* subsequent_focus_widget = NULL;
@@ -228,7 +228,7 @@ gail_focus_watcher (GSignalInvocationHint *ihint,
     {
       if (event->type == GDK_MOTION_NOTIFY && gtk_widget_has_focus (widget))
         {
-          if (widget == focus_widget)
+          if (widget == _focus_widget)
             {
               return TRUE;
             }
@@ -338,12 +338,12 @@ gail_finish_select (GtkWidget *widget)
    * If previously focused widget is not a GtkMenuItem or a GtkMenu,
    * keep track of it so we can return to it after menubar is deactivated
    */
-  if (focus_widget && 
-      !GTK_IS_MENU_ITEM (focus_widget) && 
-      !GTK_IS_MENU (focus_widget))
+  if (_focus_widget && 
+      !GTK_IS_MENU_ITEM (_focus_widget) && 
+      !GTK_IS_MENU (_focus_widget))
     {
       void *vp_focus_before_menu = &focus_before_menu;
-      focus_before_menu = focus_widget;
+      focus_before_menu = _focus_widget;
       g_object_add_weak_pointer (G_OBJECT (focus_before_menu), vp_focus_before_menu);
 
     } 
@@ -475,35 +475,35 @@ gail_focus_notify (GtkWidget *widget)
   AtkObject *atk_obj;
   gboolean transient;
 
-  if (widget != focus_widget)
+  if (widget != _focus_widget)
     {
-      if (focus_widget)
+      if (_focus_widget)
         {
-          void *vp_focus_widget = &focus_widget;
-          g_object_remove_weak_pointer (G_OBJECT (focus_widget), vp_focus_widget);
+          void *vp_focus_widget = &_focus_widget;
+          g_object_remove_weak_pointer (G_OBJECT (_focus_widget), vp_focus_widget);
         }
-      focus_widget = widget;
-      if (focus_widget)
+      _focus_widget = widget;
+      if (_focus_widget)
         {
-          void *vp_focus_widget = &focus_widget;
-          g_object_add_weak_pointer (G_OBJECT (focus_widget), vp_focus_widget);
+          void *vp_focus_widget = &_focus_widget;
+          g_object_add_weak_pointer (G_OBJECT (_focus_widget), vp_focus_widget);
           /*
            * The UI may not have been updated yet; e.g. in gtkhtml2
            * html_view_layout() is called in a idle handler
            */
-          if (focus_widget == focus_before_menu)
+          if (_focus_widget == focus_before_menu)
             {
               void *vp_focus_before_menu = &focus_before_menu;
               g_object_remove_weak_pointer (G_OBJECT (focus_before_menu), vp_focus_before_menu);
               focus_before_menu = NULL;
             }
         }
-      gail_focus_notify_when_idle (focus_widget);
+      gail_focus_notify_when_idle (_focus_widget);
     }
   else
     {
-      if (focus_widget)
-        atk_obj  = gail_get_accessible_for_widget (focus_widget, &transient);
+      if (_focus_widget)
+        atk_obj  = gail_get_accessible_for_widget (_focus_widget, &transient);
       else
         atk_obj = NULL;
       /*
@@ -784,15 +784,15 @@ gail_set_focus_object (AtkObject *focus_obj,
     }
 }
 
-static int gail_initialized = FALSE;
-
 void
-gail_accessibility_module_init (void)
+_gtk_accessibility_init (void)
 {
-  if (gail_initialized)
+  static int initialized = FALSE;
+
+  if (initialized)
     return;
 
-  gail_initialized = TRUE;
+  initialized = TRUE;
   quark_focus_object = g_quark_from_static_string ("gail-focus-object");
 
   atk_focus_tracker_init (gail_focus_tracker_init);

diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c
index c85e0e6ab0826ebe8c46f3865cbecba624251d08..d1c46347baf53a8307b89b74fc4beaf1baeab976 100644 (file)
--- a/gtk/a11y/gtkwidgetaccessible.c
+++ b/gtk/a11y/gtkwidgetaccessible.c
@@ -28,7 +28,7 @@
 #include "gtkwidgetaccessible.h"
 #include "gtknotebookpageaccessible.h"
 
-extern GtkWidget *focus_widget;
+extern GtkWidget *_focus_widget;
 
 
 static gboolean gtk_widget_accessible_on_screen           (GtkWidget *widget);
@@ -384,7 +384,7 @@ gtk_widget_accessible_ref_state_set (AtkObject *accessible)
             atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
         }
 
-      if (gtk_widget_has_focus (widget) && (widget == focus_widget))
+      if (gtk_widget_has_focus (widget) && (widget == _focus_widget))
         {
           AtkObject *focus_obj;
 

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 415faac8e0245b2fcfe689e0e40dda073437ff10..f26a9f53cd8dbd9b4ff654b13d43d98100f126a2 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -812,7 +812,7 @@ gettext_initialization (void)
 }
 
 /* XXX: Remove me after getting rid of gail */
-extern void gail_accessibility_module_init (void);
+extern void _gtk_accessibility_init (void);
 
 static void
 do_post_parse_initialization (int    *argc,
@@ -872,7 +872,7 @@ do_post_parse_initialization (int    *argc,
       _gtk_modules_init (argc, argv, NULL);
     }
 
-  gail_accessibility_module_init ();
+  _gtk_accessibility_init ();
 }